Git Command Reference – TortoiseGit – Documentation – TortoiseGit – Windows Shell Interface to Git 您所在的位置:网站首页 git named rev Git Command Reference – TortoiseGit – Documentation – TortoiseGit – Windows Shell Interface to Git

Git Command Reference – TortoiseGit – Documentation – TortoiseGit – Windows Shell Interface to Git

2023-04-11 07:22| 来源: 网络整理| 查看: 265

git-log(1)NAME

git-log - Show commit logs

SYNOPSIS

git log [] [] [[--] …]

DESCRIPTION

Shows the commit logs.

List commits that are reachable by following the parent links from the given commit(s), but exclude commits that are reachable from the one(s) given with a ^ in front of them. The output is given in reverse chronological order by default.

You can think of this as a set operation. Commits reachable from any of the commits given on the command line form a set, and then commits reachable from any of the ones given with ^ in front are subtracted from that set. The remaining commits are what comes out in the command's output. Various other options and paths parameters can be used to further limit the result.

Thus, the following command:

$ git log foo bar ^baz

means "list all the commits which are reachable from foo or bar, but not from baz".

A special notation ".." can be used as a short-hand for "^ ". For example, either of the following may be used interchangeably:

$ git log origin..HEAD $ git log HEAD ^origin

Another special notation is "…" which is useful for merges. The resulting set of commits is the symmetric difference between the two operands. The following two commands are equivalent:

$ git log A B --not $(git merge-base --all A B) $ git log A...B

The command takes options applicable to the the section called “git-rev-list(1)” command to control what is shown and how, and options applicable to the the section called “git-diff(1)” command to control how the changes each commit introduces are shown.

OPTIONS--followContinue listing the history of a file beyond renames (works only for a single file).--no-decorate , --decorate[=short|full|auto|no]Print out the ref names of any commits that are shown. If short is specified, the ref name prefixes refs/heads/, refs/tags/ and refs/remotes/ will not be printed. If full is specified, the full ref name (including prefix) will be printed. If auto is specified, then if the output is going to a terminal, the ref names are shown as if short were given, otherwise no ref names are shown. The option --decorate is short-hand for --decorate=short. Default to configuration value of log.decorate if configured, otherwise, auto.--decorate-refs= , --decorate-refs-exclude=If no --decorate-refs is given, pretend as if all refs were included. For each candidate, do not use it for decoration if it matches any patterns given to --decorate-refs-exclude or if it doesn't match any of the patterns given to --decorate-refs. The log.excludeDecoration config option allows excluding refs from the decorations, but an explicit --decorate-refs pattern will override a match in log.excludeDecoration.--sourcePrint out the ref name given on the command line by which each commit was reached.--[no-]mailmap , --[no-]use-mailmapUse mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See the section called “git-shortlog(1)”.--full-diff

Without this flag, git log -p ... shows commits that touch the specified paths, and diffs about the same specified paths. With this, the full diff is shown for commits that touch the specified paths; this means that "…" limits only commits, and doesn't limit diff for those commits.

Note that this affects all diff-based output types, e.g. those produced by --stat, etc.

--log-sizeInclude a line log size in the output for each commit, where is the length of that commit's message in bytes. Intended to speed up tools that read log messages from git log output by allowing them to allocate space in advance.-L,: , -L::

Trace the evolution of the line range given by ,, or by the function name regex , within the . You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and and (or ) must exist in the starting revision. You can specify this option more than once. Implies --patch. Patch output can be suppressed using --no-patch, but other diff formats (namely --raw, --numstat, --shortstat, --dirstat, --summary, --name-only, --name-status, --check) are not currently implemented.

and can take one of these forms:

number

If or is a number, it specifies an absolute line number (lines count from 1).

/regex/

This form will use the first line matching the given POSIX regex. If is a regex, it will search from the end of the previous -L range, if any, otherwise from the start of file. If is ^/regex/, it will search from the start of file. If is a regex, it will search starting at the line given by .

+offset or -offset

This is only valid for and will specify a number of lines before or after the line given by .

If : is given in place of and , it is a regular expression that denotes the range from the first funcname line that matches , up to the next funcname line. : searches from the end of the previous -L range, if any, otherwise from the start of file. ^: searches from the start of file. The function names are determined in the same way as git diff works out patch hunk headers (see Defining a custom hunk-header in the section called “gitattributes(5)”).

Show only commits in the specified revision range. When no is specified, it defaults to HEAD (i.e. the whole history leading to the current commit). origin..HEAD specifies all the commits reachable from the current commit (i.e. HEAD), but not from origin. For a complete list of ways to spell , see the Specifying Ranges section of the section called “gitrevisions(7)”.[--] …

Show only commits that are enough to explain how the files that match the specified paths came to be. See History Simplification below for details and other simplification modes.

Paths may need to be prefixed with -- to separate them from options or the revision range, when confusion arises.

Commit Limiting

Besides specifying a range of commits that should be listed using the special notations explained in the description, additional commit limiting may be applied.

Using more options generally further limits the output (e.g. --since= limits to commits newer than , and using it with --grep= further limits to commits whose log message has a line that matches ), unless otherwise noted.

Note that these are applied before commit ordering and formatting options, such as --reverse.

- , -n , --max-count=Limit the number of commits to output.--skip=Skip number commits before starting to show the commit output.--since= , --after=Show commits more recent than a specific date.--since-as-filter=Show all commits more recent than a specific date. This visits all commits in the range, rather than stopping at the first commit which is older than a specific date.--until= , --before=Show commits older than a specific date.--author= , --committer=Limit the commits output to ones with author/committer header lines that match the specified pattern (regular expression). With more than one --author=, commits whose author matches any of the given patterns are chosen (similarly for multiple --committer=).--grep-reflog=Limit the commits output to ones with reflog entries that match the specified pattern (regular expression). With more than one --grep-reflog, commits whose reflog message matches any of the given patterns are chosen. It is an error to use this option unless --walk-reflogs is in use.--grep=

Limit the commits output to ones with log message that matches the specified pattern (regular expression). With more than one --grep=, commits whose message matches any of the given patterns are chosen (but see --all-match).

When --notes is in effect, the message from the notes is matched as if it were part of the log message.

--all-matchLimit the commits output to ones that match all given --grep, instead of ones that match at least one.--invert-grepLimit the commits output to ones with log message that do not match the pattern specified with --grep=.-i , --regexp-ignore-caseMatch the regular expression limiting patterns without regard to letter case.--basic-regexpConsider the limiting patterns to be basic regular expressions; this is the default.-E , --extended-regexpConsider the limiting patterns to be extended regular expressions instead of the default basic regular expressions.-F , --fixed-stringsConsider the limiting patterns to be fixed strings (don't interpret pattern as a regular expression).-P , --perl-regexp

Consider the limiting patterns to be Perl-compatible regular expressions.

Support for these types of regular expressions is an optional compile-time dependency. If Git wasn't compiled with support for them providing this option will cause it to die.

--remove-emptyStop when a given path disappears from the tree.--mergesPrint only merge commits. This is exactly the same as --min-parents=2.--no-mergesDo not print commits with more than one parent. This is exactly the same as --max-parents=1.--min-parents= , --max-parents= , --no-min-parents , --no-max-parents

Show only commits which have at least (or at most) that many parent commits. In particular, --max-parents=1 is the same as --no-merges, --min-parents=2 is the same as --merges. --max-parents=0 gives all root commits and --min-parents=3 all octopus merges.

--no-min-parents and --no-max-parents reset these limits (to no limit) again. Equivalent forms are --min-parents=0 (any commit has 0 or more parents) and --max-parents=-1 (negative numbers denote no upper limit).

--first-parent

When finding commits to include, follow only the first parent commit upon seeing a merge commit. This option can give a better overview when viewing the evolution of a particular topic branch, because merges into a topic branch tend to be only about adjusting to updated upstream from time to time, and this option allows you to ignore the individual commits brought in to your history by such a merge.

This option also changes default diff format for merge commits to first-parent, see --diff-merges=first-parent for details.

--exclude-first-parent-onlyWhen finding commits to exclude (with a ^), follow only the first parent commit upon seeing a merge commit. This can be used to find the set of changes in a topic branch from the point where it diverged from the remote branch, given that arbitrary merges can be valid topic branch changes.--notReverses the meaning of the ^ prefix (or lack thereof) for all following revision specifiers, up to the next --not.--allPretend as if all the refs in refs/, along with HEAD, are listed on the command line as .--branches[=]Pretend as if all the refs in refs/heads are listed on the command line as . If is given, limit branches to ones matching given shell glob. If pattern lacks ?, *, or [, /* at the end is implied.--tags[=]Pretend as if all the refs in refs/tags are listed on the command line as . If is given, limit tags to ones matching given shell glob. If pattern lacks ?, *, or [, /* at the end is implied.--remotes[=]Pretend as if all the refs in refs/remotes are listed on the command line as . If is given, limit remote-tracking branches to ones matching given shell glob. If pattern lacks ?, *, or [, /* at the end is implied.--glob=Pretend as if all the refs matching shell glob are listed on the command line as . Leading refs/, is automatically prepended if missing. If pattern lacks ?, *, or [, /* at the end is implied.--exclude=

Do not include refs matching that the next --all, --branches, --tags, --remotes, or --glob would otherwise consider. Repetitions of this option accumulate exclusion patterns up to the next --all, --branches, --tags, --remotes, or --glob option (other options or arguments do not clear accumulated patterns).

The patterns given should not begin with refs/heads, refs/tags, or refs/remotes when applied to --branches, --tags, or --remotes, respectively, and they must begin with refs/ when applied to --glob or --all. If a trailing /* is intended, it must be given explicitly.

--reflogPretend as if all objects mentioned by reflogs are listed on the command line as .--alternate-refsPretend as if all objects mentioned as ref tips of alternate repositories were listed on the command line. An alternate repository is any repository whose object directory is specified in objects/info/alternates. The set of included objects may be modified by core.alternateRefsCommand, etc. See the section called “git-config(1)”.--single-worktreeBy default, all working trees will be examined by the following options when there are more than one (see the section called “git-worktree(1)”): --all, --reflog and --indexed-objects. This option forces them to examine the current working tree only.--ignore-missingUpon seeing an invalid object name in the input, pretend as if the bad input was not given.--bisectPretend as if the bad bisection ref refs/bisect/bad was listed and as if it was followed by --not and the good bisection refs refs/bisect/good-* on the command line.--stdinIn addition to the listed on the command line, read them from the standard input. If a -- separator is seen, stop reading commits and start reading paths to limit the result.--cherry-markLike --cherry-pick (see below) but mark equivalent commits with = rather than omitting them, and inequivalent ones with +.--cherry-pick

Omit any commit that introduces the same change as another commit on the other side when the set of commits are limited with symmetric difference.

For example, if you have two branches, A and B, a usual way to list all commits on only one side of them is with --left-right (see the example below in the description of the --left-right option). However, it shows the commits that were cherry-picked from the other branch (for example, 3rd on b may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output.

--left-only , --right-only

List only commits on the respective side of a symmetric difference, i.e. only those which would be marked by --left-right.

For example, --cherry-pick --right-only A...B omits those commits from B which are in A or are patch-equivalent to a commit in A. In other words, this lists the + commits from git cherry A B. More precisely, --cherry-pick --right-only --no-merges gives the exact list.

--cherryA synonym for --right-only --cherry-mark --no-merges; useful to limit the output to the commits on our side and mark those that have been applied to the other side of a forked history with git log --cherry upstream...mybranch, similar to git cherry upstream mybranch.-g , --walk-reflogs

Instead of walking the commit ancestry chain, walk reflog entries from the most recent one to older ones. When this option is used you cannot specify commits to exclude (that is, ^commit, commit1..commit2, and commit1...commit2 notations cannot be used).

With --pretty format other than oneline and reference (for obvious reasons), this causes the output to have two extra lines of information taken from the reflog. The reflog designator in the output may be shown as ref@{Nth} (where Nth is the reverse-chronological index in the reflog) or as ref@{timestamp} (with the timestamp for that entry), depending on a few rules:

If the starting point is specified as ref@{Nth}, show the index format.If the starting point was specified as ref@{now}, show the timestamp format.If neither was used, but --date was given on the command line, show the timestamp in the format requested by --date.Otherwise, show the index format.

Under --pretty=oneline, the commit message is prefixed with this information on the same line. This option cannot be combined with --reverse. See also the section called “git-reflog(1)”.

Under --pretty=reference, this information will not be shown at all.

--mergeAfter a failed merge, show refs that touch files having a conflict and don't exist on all heads to merge.--boundaryOutput excluded boundary commits. Boundary commits are prefixed with -.History Simplification

Sometimes you are only interested in parts of the history, for example the commits modifying a particular . But there are two parts of History Simplification, one part is selecting the commits and the other is how to do it, as there are various strategies to simplify the history.

The following options select the commits to be shown:

Commits modifying the given are selected.--simplify-by-decorationCommits that are referred by some branch or tag are selected.

Note that extra commits can be shown to give a meaningful history.

The following options affect the way the simplification is performed:

Default modeSimplifies the history to the simplest history explaining the final state of the tree. Simplest because it prunes some side branches if the end result is the same (i.e. merging branches with the same content)--show-pullsInclude all commits from the default mode, but also any merge commits that are not TREESAME to the first parent but are TREESAME to a later parent. This mode is helpful for showing the merge commits that "first introduced" a change to a branch.--full-historySame as the default mode, but does not prune some history.--denseOnly the selected commits are shown, plus some to have a meaningful history.--sparseAll commits in the simplified history are shown.--simplify-mergesAdditional option to --full-history to remove some needless merges from the resulting history, as there are no selected commits contributing to this merge.--ancestry-pathWhen given a range of commits to display (e.g. commit1..commit2 or commit2 ^commit1), only display commits that exist directly on the ancestry chain between the commit1 and commit2, i.e. commits that are both descendants of commit1, and ancestors of commit2.

A more detailed explanation follows.

Suppose you specified foo as the . We shall call commits that modify foo !TREESAME, and the rest TREESAME. (In a diff filtered for foo, they look different and equal, respectively.)

In the following, we will always refer to the same example history to illustrate the differences between simplification settings. We assume that you are filtering for a file foo in this commit graph:

.-A---M---N---O---P---Q / / / / / / I B C D E Y \ / / / / / `-------------' X

The horizontal line of history A---Q is taken to be the first parent of each merge. The commits are:

I is the initial commit, in which foo exists with contents asdf, and a file quux exists with contents quux. Initial commits are compared to an empty tree, so I is !TREESAME.In A, foo contains just foo.B contains the same change as A. Its merge M is trivial and hence TREESAME to all parents.C does not change foo, but its merge N changes it to foobar, so it is not TREESAME to any parent.D sets foo to baz. Its merge O combines the strings from N and D to foobarbaz; i.e., it is not TREESAME to any parent.E changes quux to xyzzy, and its merge P combines the strings to quux xyzzy. P is TREESAME to O, but not to E.X is an independent root commit that added a new file side, and Y modified it. Y is TREESAME to X. Its merge Q added side to P, and Q is TREESAME to P, but not to Y.

rev-list walks backwards through history, including or excluding commits based on whether --full-history and/or parent rewriting (via --parents or --children) are used. The following settings are available.

Default mode

Commits are included if they are not TREESAME to any parent (though this can be changed, see --sparse below). If the commit was a merge, and it was TREESAME to one parent, follow only that parent. (Even if there are several TREESAME parents, follow only one of them.) Otherwise, follow all parents.

This results in:

.-A---N---O / / / I---------D

Note how the rule to only follow the TREESAME parent, if one is available, removed B from consideration entirely. C was considered via N, but is TREESAME. Root commits are compared to an empty tree, so I is !TREESAME.

Parent/child relations are only visible with --parents, but that does not affect the commits selected in default mode, so we have shown the parent lines.

--full-history without parent rewriting

This mode differs from the default in one point: always follow all parents of a merge, even if it is TREESAME to one of them. Even if more than one side of the merge has commits that are included, this does not imply that the merge itself is! In the example, we get

I A B N D O P Q

M was excluded because it is TREESAME to both parents. E, C and B were all walked, but only B was !TREESAME, so the others do not appear.

Note that without parent rewriting, it is not really possible to talk about the parent/child relationships between the commits, so we show them disconnected.

--full-history with parent rewriting

Ordinary commits are only included if they are !TREESAME (though this can be changed, see --sparse below).

Merges are always included. However, their parent list is rewritten: Along each parent, prune away commits that are not included themselves. This results in

.-A---M---N---O---P---Q / / / / / I B / D / \ / / / / `-------------'

Compare to --full-history without rewriting above. Note that E was pruned away because it is TREESAME, but the parent list of P was rewritten to contain E's parent I. The same happened for C and N, and X, Y and Q.

In addition to the above settings, you can change whether TREESAME affects inclusion:

--denseCommits that are walked are included if they are not TREESAME to any parent.--sparse

All commits that are walked are included.

Note that without --full-history, this still simplifies merges: if one of the parents is TREESAME, we follow only that one, so the other sides of the merge are never walked.

--simplify-merges

First, build a history graph in the same way that --full-history with parent rewriting does (see above).

Then simplify each commit C to its replacement C' in the final history according to the following rules:

Set C' to C.Replace each parent P of C' with its simplification P'. In the process, drop parents that are ancestors of other parents or that are root commits TREESAME to an empty tree, and remove duplicates, but take care to never drop all parents that we are TREESAME to.If after this parent rewriting, C' is a root or merge commit (has zero or >1 parents), a boundary commit, or !TREESAME, it remains. Otherwise, it is replaced with its only parent.

The effect of this is best shown by way of comparing to --full-history with parent rewriting. The example turns into:

.-A---M---N---O / / / I B D \ / / `---------'

Note the major differences in N, P, and Q over --full-history:

N's parent list had I removed, because it is an ancestor of the other parent M. Still, N remained because it is !TREESAME.P's parent list similarly had I removed. P was then removed completely, because it had one parent and is TREESAME.Q's parent list had Y simplified to X. X was then removed, because it was a TREESAME root. Q was then removed completely, because it had one parent and is TREESAME.

There is another simplification mode available:

--ancestry-path

Limit the displayed commits to those directly on the ancestry chain between the from and to commits in the given commit range. I.e. only display commits that are ancestor of the to commit and descendants of the from commit.

As an example use case, consider the following commit history:

D---E-------F / \ \ B---C---G---H---I---J / \ A-------K---------------L--M

A regular D..M computes the set of commits that are ancestors of M, but excludes the ones that are ancestors of D. This is useful to see what happened to the history leading to M since D, in the sense that what does M have that did not exist in D. The result in this example would be all the commits, except A and B (and D itself, of course).

When we want to find out what commits in M are contaminated with the bug introduced by D and need fixing, however, we might want to view only the subset of D..M that are actually descendants of D, i.e. excluding C and K. This is exactly what the --ancestry-path option does. Applied to the D..M range, it results in:

E-------F \ \ G---H---I---J \ L--M

Before discussing another option, --show-pulls, we need to create a new example history.

A common problem users face when looking at simplified history is that a commit they know changed a file somehow does not appear in the file's simplified history. Let's demonstrate a new example and show how options such as --full-history and --simplify-merges works in that case:

.-A---M-----C--N---O---P / / \ \ \/ / / I B \ R-'`-Z' / \ / \/ / \ / /\ / `---X--' `---Y--'

For this example, suppose I created file.txt which was modified by A, B, and X in different ways. The single-parent commits C, Z, and Y do not change file.txt. The merge commit M was created by resolving the merge conflict to include both changes from A and B and hence is not TREESAME to either. The merge commit R, however, was created by ignoring the contents of file.txt at M and taking only the contents of file.txt at X. Hence, R is TREESAME to X but not M. Finally, the natural merge resolution to create N is to take the contents of file.txt at R, so N is TREESAME to R but not C. The merge commits O and P are TREESAME to their first parents, but not to their second parents, Z and Y respectively.

When using the default mode, N and R both have a TREESAME parent, so those edges are walked and the others are ignored. The resulting history graph is:

I---X

When using --full-history, Git walks every edge. This will discover the commits A and B and the merge M, but also will reveal the merge commits O and P. With parent rewriting, the resulting graph is:

.-A---M--------N---O---P / / \ \ \/ / / I B \ R-'`--' / \ / \/ / \ / /\ / `---X--' `------'

Here, the merge commits O and P contribute extra noise, as they did not actually contribute a change to file.txt. They only merged a topic that was based on an older version of file.txt. This is a common issue in repositories using a workflow where many contributors work in parallel and merge their topic branches along a single trunk: manu unrelated merges appear in the --full-history results.

When using the --simplify-merges option, the commits O and P disappear from the results. This is because the rewritten second parents of O and P are reachable from their first parents. Those edges are removed and then the commits look like single-parent commits that are TREESAME to their parent. This also happens to the commit N, resulting in a history view as follows:

.-A---M--. / / \ I B R \ / / \ / / `---X--'

In this view, we see all of the important single-parent changes from A, B, and X. We also see the carefully-resolved merge M and the not-so-carefully-resolved merge R. This is usually enough information to determine why the commits A and B "disappeared" from history in the default view. However, there are a few issues with this approach.

The first issue is performance. Unlike any previous option, the --simplify-merges option requires walking the entire commit history before returning a single result. This can make the option difficult to use for very large repositories.

The second issue is one of auditing. When many contributors are working on the same repository, it is important which merge commits introduced a change into an important branch. The problematic merge R above is not likely to be the merge commit that was used to merge into an important branch. Instead, the merge N was used to merge R and X into the important branch. This commit may have information about why the change X came to override the changes from A and B in its commit message.

--show-pulls

In addition to the commits shown in the default history, show each merge commit that is not TREESAME to its first parent but is TREESAME to a later parent.

When a merge commit is included by --show-pulls, the merge is treated as if it "pulled" the change from another branch. When using --show-pulls on this example (and no other options) the resulting graph is:

I---X---R---N

Here, the merge commits R and N are included because they pulled the commits X and R into the base branch, respectively. These merges are the reason the commits A and B do not appear in the default history.

When --show-pulls is paired with --simplify-merges, the graph includes all of the necessary information:

.-A---M--. N / / \ / I B R \ / / \ / / `---X--'

Notice that since M is reachable from R, the edge from N to M was simplified away. However, N still appears in the history as an important commit because it "pulled" the change R into the main branch.

The --simplify-by-decoration option allows you to view only the big picture of the topology of the history, by omitting commits that are not referenced by tags. Commits are marked as !TREESAME (in other words, kept after history simplification rules described above) if (1) they are referenced by tags, or (2) they change the contents of the paths given on the command line. All other commits are marked as TREESAME (subject to be simplified away).

Commit Ordering

By default, the commits are shown in reverse chronological order.

--date-orderShow no parents before all of its children are shown, but otherwise show commits in the commit timestamp order.--author-date-orderShow no parents before all of its children are shown, but otherwise show commits in the author timestamp order.--topo-order

Show no parents before all of its children are shown, and avoid showing commits on multiple lines of history intermixed.

For example, in a commit history like this:

---1----2----4----7 \ \ 3----5----6----8---

where the numbers denote the order of commit timestamps, git rev-list and friends with --date-order show the commits in the timestamp order: 8 7 6 5 4 3 2 1.

With --topo-order, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); some older commits are shown before newer ones in order to avoid showing the commits from two parallel development track mixed together.

--reverseOutput the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with --walk-reflogs.Object Traversal

These options are mostly targeted for packing of Git repositories.

--no-walk[=(sorted|unsorted)]Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument unsorted is given, the commits are shown in the order they were given on the command line. Otherwise (if sorted or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with --graph.--do-walkOverrides a previous --no-walk.Commit Formatting--pretty[=] , --format=

Pretty-print the contents of the commit logs in a given format, where can be one of oneline, short, medium, full, fuller, reference, email, raw, format: and tformat:. When is none of the above, and has %placeholder in it, it acts as if --pretty=tformat: were given.

See the "PRETTY FORMATS" section for some additional details for each format. When = part is omitted, it defaults to medium.

Note: you can specify the default pretty format in the repository configuration (see the section called “git-config(1)”).

--abbrev-commit

Instead of showing the full 40-byte hexadecimal commit object name, show a prefix that names the object uniquely. "--abbrev=" (which also modifies diff output, if it is displayed) option can be used to specify the minimum length of the prefix.

This should make "--pretty=oneline" a whole lot more readable for people using 80-column terminals.

--no-abbrev-commitShow the full 40-byte hexadecimal commit object name. This negates --abbrev-commit, either explicit or implied by other options such as "--oneline". It also overrides the log.abbrevCommit variable.--onelineThis is a shorthand for "--pretty=oneline --abbrev-commit" used together.--encoding=Commit objects record the character encoding used for the log message in their encoding header; this option can be used to tell the command to re-code the commit log message in the encoding preferred by the user. For non plumbing commands this defaults to UTF-8. Note that if an object claims to be encoded in X and we are outputting in X, we will output the object verbatim; this means that invalid sequences in the original commit may be copied to the output. Likewise, if iconv(3) fails to convert the commit, we will quietly output the original object verbatim.--expand-tabs= , --expand-tabs , --no-expand-tabs

Perform a tab expansion (replace each tab with enough spaces to fill to the next display column that is multiple of ) in the log message before showing it in the output. --expand-tabs is a short-hand for --expand-tabs=8, and --no-expand-tabs is a short-hand for --expand-tabs=0, which disables tab expansion.

By default, tabs are expanded in pretty formats that indent the log message by 4 spaces (i.e. medium, which is the default, full, and fuller).

--notes[=]

Show the notes (see the section called “git-notes(1)”) that annotate the commit, when showing the commit log message. This is the default for git log, git show and git whatchanged commands when there is no --pretty, --format, or --oneline option given on the command line.

By default, the notes shown are from the notes refs listed in the core.notesRef and notes.displayRef variables (or corresponding environment overrides). See the section called “git-config(1)” for more details.

With an optional argument, use the ref to find the notes to display. The ref can specify the full refname when it begins with refs/notes/; when it begins with notes/, refs/ and otherwise refs/notes/ is prefixed to form a full name of the ref.

Multiple --notes options can be combined to control which notes are being displayed. Examples: "--notes=foo" will show only notes from "refs/notes/foo"; "--notes=foo --notes" will show both notes from "refs/notes/foo" and from the default notes ref(s).

--no-notesDo not show notes. This negates the above --notes option, by resetting the list of notes refs from which notes are shown. Options are parsed in the order given on the command line, so e.g. "--notes --notes=foo --no-notes --notes=bar" will only show notes from "refs/notes/bar".--show-notes[=] , --[no-]standard-notesThese options are deprecated. Use the above --notes/--no-notes options instead.--show-signatureCheck the validity of a signed commit object by passing the signature to gpg --verify and show the output.--relative-dateSynonym for --date=relative.--date=

Only takes effect for dates shown in human-readable format, such as when using --pretty. log.date config variable sets a default value for the log command's --date option. By default, dates are shown in the original time zone (either committer's or author's). If -local is appended to the format (e.g., iso-local), the user's local time zone is used instead.

--date=relative shows dates relative to the current time, e.g. 2 hours ago. The -local option has no effect for --date=relative.

--date=local is an alias for --date=default-local.

--date=iso (or --date=iso8601) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:

a space instead of the T date/time delimitera space between time and time zoneno colon between hours and minutes of the time zone

--date=iso-strict (or --date=iso8601-strict) shows timestamps in strict ISO 8601 format.

--date=rfc (or --date=rfc2822) shows timestamps in RFC 2822 format, often found in email messages.

--date=short shows only the date, but not the time, in YYYY-MM-DD format.

--date=raw shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a + or - with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with strftime("%s %z")). Note that the -local option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value.

--date=human shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are "this year", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted.

--date=unix shows the date as a Unix epoch timestamp (seconds since 1970). As with --raw, this is always in UTC and therefore -local has no effect.

--date=format:... feeds the format ... to your system strftime, except for %s, %z, and %Z, which are handled internally. Use --date=format:%c to show the date in your system locale's preferred format. See the strftime manual for a complete list of format placeholders. When using -local, the correct syntax is --date=format-local:....

--date=default is the default format, and is similar to --date=rfc2822, with a few exceptions:

there is no comma after the day-of-weekthe time zone is omitted when the local time zone is used--parentsPrint also the parents of the commit (in the form "commit parent…"). Also enables parent rewriting, see History Simplification above.--childrenPrint also the children of the commit (in the form "commit child…"). Also enables parent rewriting, see History Simplification above.--left-right

Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with . If combined with --boundary, those commits are prefixed with -.

For example, if you have this topology:

y---b---b branch B / \ / / . / / \ o---x---a---a branch A

you would get an output like this:

$ git rev-list --left-right --boundary --pretty=oneline A...B >bbbbbbb... 3rd on b >bbbbbbb... 2nd on b b_date) ? -1 : (a_date == b_date) ? 0 : 1; } - static void describe(char *arg) -static void describe(struct commit *cmit, int last_one) ++static void describe(char *arg, int last_one) { + unsigned char sha1[20]; + struct commit *cmit; struct commit_list *list; static int initialized = 0; struct commit_name *n; + if (get_sha1(arg, sha1) < 0) + usage(describe_usage); + cmit = lookup_commit_reference(sha1); + if (!cmit) + usage(describe_usage); + if (!initialized) { initialized = 1; for_each_ref(get_name);

It is preceded with a "git diff" header, that looks like this (when the -c option is used):

diff --combined file

or like this (when the --cc option is used):

diff --cc file

It is followed by one or more extended header lines (this example shows a merge with two parents):

index ,.. mode ,.. new file mode deleted file mode ,

The mode ,.. line appears only if at least one of the is different from the rest. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two and are not used by combined diff format.

It is followed by two-line from-file/to-file header

--- a/file +++ b/file

Similar to two-line header for traditional unified diff format, /dev/null is used to signal created or deleted files.

However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file you get a N+1 line from-file/to-file header, where N is the number of parents in the merge commit

--- a/file --- a/file --- a/file +++ b/file

This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents.

Chunk header format is modified to prevent people from accidentally feeding it to patch -p1. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended index header:

@@@ @@@

There are (number of parents + 1) @ characters in the chunk header for combined diff format.

Unlike the traditional unified diff format, which shows two files A and B with a single column that has - (minus -- appears in A but removed in B), + (plus -- missing in A but added to B), or " " (space -- unchanged) prefix, this format compares two or more files file1, file2,… with one file X, and shows how X differs from each of fileN. One column for each of fileN is prepended to the output line to note how X's line is different from it.

A - character in the column N means that the line appears in fileN but it does not appear in the result. A + character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent).

In the above example output, the function signature was changed from both files (hence two - removals from both file1 and file2, plus ++ to mean one line that was added does not appear in either file1 or file2). Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with +).

When shown by git diff-tree -c, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by git diff-files -c, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka "their version").

EXAMPLESgit log --no-mergesShow the whole commit history, but skip any mergesgit log v2.6.12.. include/scsi drivers/scsiShow all commits since version v2.6.12 that changed any file in the include/scsi or drivers/scsi subdirectoriesgit log --since="2 weeks ago" -- gitkShow the changes during the last two weeks to the file gitk. The -- is necessary to avoid confusion with the branch named gitkgit log --name-status release..testShow the commits that are in the "test" branch but not yet in the "release" branch, along with the list of paths each commit modifies.git log --follow builtin/rev-list.cShows the commits that changed builtin/rev-list.c, including those commits that occurred before the file was given its present name.git log --branches --not --remotes=originShows all commits that are in any of local branches but not in any of remote-tracking branches for origin (what you have that origin doesn't).git log master --not --remotes=*/masterShows all commits that are in local master but not in any remote repository master branches.git log -p -m --first-parentShows the history including change diffs, but only from the main branch perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges. This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch.git log -L '/int main/',/^}/:main.cShows how the function main() in the file main.c evolved over time.git log -3Limits the number of commits to show to 3.DISCUSSION

Git is to some extent character encoding agnostic.

The contents of the blob objects are uninterpreted sequences of bytes. There is no encoding translation at the core level.

Path names are encoded in UTF-8 normalization form C. This applies to tree objects, the index file, ref names, as well as path names in command line arguments, environment variables and config files (.git/config (see the section called “git-config(1)”), the section called “gitignore(5)”, the section called “gitattributes(5)” and the section called “gitmodules(5)”).

Note that Git at the core level treats path names simply as sequences of non-NUL bytes, there are no path name encoding conversions (except on Mac and Windows). Therefore, using non-ASCII path names will mostly work even on platforms and file systems that use legacy extended ASCII encodings. However, repositories created on such systems will not work properly on UTF-8-based systems (e.g. Linux, Mac, Windows) and vice versa. Additionally, many Git-based tools simply assume path names to be UTF-8 and will fail to display other encodings correctly.

Commit log messages are typically encoded in UTF-8, but other extended ASCII encodings are also supported. This includes ISO-8859-x, CP125x and many others, but not UTF-16/32, EBCDIC and CJK multi-byte encodings (GBK, Shift-JIS, Big5, EUC-x, CP9xx etc.).

Although we encourage that the commit log messages are encoded in UTF-8, both the core and Git Porcelain are designed not to force UTF-8 on projects. If all participants of a particular project find it more convenient to use legacy encodings, Git does not forbid it. However, there are a few things to keep in mind.

git commit and git commit-tree issues a warning if the commit log message given to it does not look like a valid UTF-8 string, unless you explicitly say your project uses a legacy encoding. The way to say this is to have i18n.commitEncoding in .git/config file, like this:

[i18n] commitEncoding = ISO-8859-1

Commit objects created with the above setting record the value of i18n.commitEncoding in its encoding header. This is to help other people who look at them later. Lack of this header implies that the commit log message is encoded in UTF-8.

git log, git show, git blame and friends look at the encoding header of a commit object, and try to re-code the log message into UTF-8 unless otherwise specified. You can specify the desired output encoding with i18n.logOutputEncoding in .git/config file, like this:

[i18n] logOutputEncoding = ISO-8859-1

If you do not have this configuration variable, the value of i18n.commitEncoding is used instead.

Note that we deliberately chose not to re-code the commit log message when a commit is made to force UTF-8 at the commit object level, because re-coding to UTF-8 is not necessarily a reversible operation.

CONFIGURATION

See the section called “git-config(1)” for core variables and the section called “git-diff(1)” for settings related to diff generation.

format.prettyDefault for the --format option. (See Pretty Formats above.) Defaults to medium.i18n.logOutputEncodingEncoding to use when displaying logs. (See Discussion above.) Defaults to the value of i18n.commitEncoding if set, and UTF-8 otherwise.log.date

Default format for human-readable dates. (Compare the --date option.) Defaults to "default", which means to write dates like Sat May 8 19:35:34 2010 -0500.

If the format is set to "auto:foo" and the pager is in use, format "foo" will be the used for the date format. Otherwise "default" will be used.

log.followIf true, git log will act as if the --follow option was used when a single is given. This has the same limitations as --follow, i.e. it cannot be used to follow multiple files and does not work well on non-linear history.log.showRootIf false, git log and related commands will not treat the initial commit as a big creation event. Any root commits in git log -p output would be shown without a diff attached. The default is true.log.showSignatureIf true, git log and related commands will act as if the --show-signature option was passed to them.mailmap.*See the section called “git-shortlog(1)”.notes.displayRef

Which refs, in addition to the default set by core.notesRef or GIT_NOTES_REF, to read notes from when showing commit messages with the log family of commands. See the section called “git-notes(1)”.

May be an unabbreviated ref name or a glob and may be specified multiple times. A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored.

This setting can be disabled by the --no-notes option, overridden by the GIT_NOTES_DISPLAY_REF environment variable, and overridden by the --notes= option.

GIT

Part of the the section called “git(1)” suite



【本文地址】

公司简介

联系我们

今日新闻

    推荐新闻

    专题文章
      CopyRight 2018-2019 实验室设备网 版权所有